xend: Remove hardcoded (and apparently unused) xend version.
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 15 Jan 2008 14:24:05 +0000 (14:24 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 15 Jan 2008 14:24:05 +0000 (14:24 +0000)
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
tools/python/xen/xend/XendNode.py
tools/python/xen/xend/server/SrvDaemon.py

index 841403f71de0ea716dbd3ca1dc96b6382a233292..b0e3963232efc40b4bb3145a8dbec276be69055b 100644 (file)
@@ -377,13 +377,7 @@ class XendNode:
     def xen_version(self):
         info = self.xc.xeninfo()
 
-        try:
-            from xen import VERSION
-            info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
-                    'Xend': VERSION}
-        except (ImportError, AttributeError):
-            info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info,
-                    'Xend': '3.0.3'}
+        info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info}
 
         # Add xend_config_format
         info.update(self.xendinfo_dict())
index a265aef9067e550c9a7cacfcf4143eb81bfbff6c..225b901168088cef6addf1c79d31fe00e0a44fe3 100644 (file)
@@ -335,12 +335,6 @@ class Daemon:
             log.info("Xend changeset: %s.", xinfo['xen_changeset'])
             del xc
 
-            try:
-                from xen import VERSION
-                log.info("Xend version: %s", VERSION)
-            except ImportError:
-                log.info("Xend version: Unknown.")
-
             relocate.listenRelocation()
             servers = SrvServer.create()
             servers.start(status)